From 5a86cbd116bd55fbb31b3c90baca8cd30dd395d0 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 12 Jan 1999 20:45:37 +0000 Subject: [PATCH] Minor fix to handling of misc->[x/y]pad Tue Jan 12 15:41:20 1999 Owen Taylor * gtk/gtklabel.c (gtk_label_expose): Minor fix to handling of misc->[x/y]pad --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ gtk/gtklabel.c | 4 ++-- 8 files changed, 79 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e2132b8d39..f7a6ea3bff 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +Tue Jan 12 15:41:20 1999 Owen Taylor + + * gtk/gtklabel.c (gtk_label_expose): Minor fix + to handling of misc->[x/y]pad + +Tue Jan 12 14:31:43 1999 Owen Taylor + + * gtk/gtkstyle.[ch] (gtk_style_apply_default_pixmap): + Add back as wrapper function to restore source/binary + compatibility. grrrr. + Tue Jan 12 13:47:07 1999 Tim Janik * reworked the redrawing heuristics somewhat, this fixed a bunch of diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 84ac17b30f..8015fecf41 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -921,12 +921,12 @@ gtk_label_expose (GtkWidget *widget, gdk_gc_set_clip_rectangle (widget->style->fg_gc[widget->state], &event->area); x = widget->allocation.x + misc->xpad + - (widget->allocation.width - label->max_width) + (widget->allocation.width - label->max_width - 2 * misc->xpad) * misc->xalign + 0.5; y = (widget->allocation.y + (widget->allocation.height - - widget->requisition.height) * misc->yalign + - widget->requisition.height - 2 * misc->ypad) * misc->yalign + misc->ypad + 0.5); for (word = label->words; word; word = word->next) { -- 2.30.2